userMenu: Don't disconnect account signals when disabled

By disconnecting the 'notify::connection-status' signal as soon as the account
is disabled, we were missing the signal telling us when the status was moving
from CONNECTING/CONNECTED to DISCONNECTED and so the status icon was never
updated.

What we really want is to disconnect the signal when the account is removed
from the account manager as we don't care about it any more.

https://bugzilla.gnome.org/show_bug.cgi?id=669112

diff --git a/js/ui/userMenu.js b/js/ui/userMenu.js
index 807e1192f7f2988493eaea191899e9f2c70abda5..4dd9057d4412988f5c1a195b458484ec50c863f1 100644 (file)
--- a/js/ui/userMenu.js
+++ b/js/ui/userMenu.js
@@ -481,10 +481,8 @@ const UserMenuButton = new Lang.Class({
                                   Lang.bind(this, this._updatePresenceIcon));
         this._accountMgr.connect('account-enabled',
                                   Lang.bind(this, this._onAccountEnabled));
-        this._accountMgr.connect('account-disabled',
-                                 Lang.bind(this, this._onAccountDisabled));
         this._accountMgr.connect('account-removed',
-                                  Lang.bind(this, this._onAccountDisabled));
+                                  Lang.bind(this, this._onAccountRemoved));
         this._accountMgr.prepare_async(null, Lang.bind(this,
             function(mgr) {
                 let [presence, s, msg] = mgr.get_most_available_presence();
@@ -645,7 +643,7 @@ const UserMenuButton = new Lang.Class({
         this._updateChangingPresence();
     },
 
-    _onAccountDisabled: function(accountMgr, account) {
+    _onAccountRemoved: function(accountMgr, account) {
         account.disconnect(account._changingId);
         account._changingId = 0;
         this._updateChangingPresence();